Skip to content

Imp catch up 03-12-2026#28

Merged
Sage-Jones merged 194 commits intoQuantumBlueSS14:masterfrom
Sage-Jones:imp-catch-up-03-12-2026
Mar 14, 2026
Merged

Imp catch up 03-12-2026#28
Sage-Jones merged 194 commits intoQuantumBlueSS14:masterfrom
Sage-Jones:imp-catch-up-03-12-2026

Conversation

@Sage-Jones
Copy link

About the PR

Catching up on imp changes from the last couple months!
This time it comes with the reverts :3

hivehum and others added 30 commits February 13, 2026 07:21
* bring back valentines

* if you fail an integration test you should just change the test so it doesnt fail you :clueless:

* ill fucking try it i guess

Co-authored-by: FancyPlanks <123175013+FancyPlanks@users.noreply.github.com>

* maybe this webedit will work :clueless:

* i cant test this because rider is imploding

* this should work

* THIS should work

---------

Co-authored-by: FancyPlanks <123175013+FancyPlanks@users.noreply.github.com>
Co-authored-by: mq <113324899+mqole@users.noreply.github.com>
Co-authored-by: Dinner <180707738+DinnerCalzone@users.noreply.github.com>
* wip

* egg.....

* wiz

* oough

* more work

* boop

* wizzardddd

* moree stufff

* bwugh

* baweargh

* weeeee more stuff

* bweeee

* hell!!

* aaaaaaaaaaaaaaa

* sgrdfgfd

* Brit's Spells
Committing these to get em looked at by Wolfie.

* to sort later

* Keb Formatting Error,,,,,,,,
Thus Pisked Up

* Summon Materials!
Added spells for summoning materials.

* and this one too!
a quick fix to summoning glass

* Added Gun
Added the most powerful spell of all: Gun! Fires a single bullet that does like 12 damage unarmed.

* rock time

* some fixes

* full links

* glasses

* hmhmhmhm

* various fixes

* remove extra text

* mono and moved clothing

* it broke

* sobbing

* yahooo!

* more stuff

* not imp

* oops

* ya

* progress!!!

* yay!

* more stuff

* oops

* pacify

* YEAHHHHH

* boop

* ough my linter

* oops

* oops

* linter

* Update Resources/Prototypes/_Impstation/Entities/Mobs/Animals/magic.yml

Co-authored-by: FancyPlanks <123175013+FancyPlanks@users.noreply.github.com>

* Update Resources/Prototypes/_Impstation/Entities/Mobs/Animals/magic.yml

Co-authored-by: FancyPlanks <123175013+FancyPlanks@users.noreply.github.com>

* Update Resources/Prototypes/_Impstation/Magic/magic_items.yml

Co-authored-by: FancyPlanks <123175013+FancyPlanks@users.noreply.github.com>

* Update Resources/Prototypes/_Impstation/Entities/Mobs/Animals/magic.yml

Co-authored-by: FancyPlanks <123175013+FancyPlanks@users.noreply.github.com>

* yay

* Update projectile_spells.yml

* Update spellbook-catalog.ftl

* bwargh

* Update Content.Shared/_Impstation/Abilities/Curse/CurseTentacleSystem.cs

Co-authored-by: FancyPlanks <123175013+FancyPlanks@users.noreply.github.com>

* Update CurseTentacleSystem.cs

---------

Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
Co-authored-by: britno <jamesmorrison0130@gmail.com>
Co-authored-by: PaigeM~ <roseliasquartz@gmail.com>
Co-authored-by: FancyPlanks <123175013+FancyPlanks@users.noreply.github.com>
* imbide slowly

* fix the test hopefully
* third times the charm

* oops

* my little upmerge
impstation#4090)

* check players make announcement

* gamedrule yuup

* comments
* adds a semi-destroyed wizard shuttle to the round start salvage wrecks pool

* armblade bolted prying
* adds a semi-destroyed wizard shuttle to the round start salvage wrecks pool

* vrex tweaks
* adds a semi-destroyed wizard shuttle to the round start salvage wrecks pool

* lollipop melee

* lollipop melee
mushrooms and more leafs are eatable for the cows and pigs

Co-authored-by: mq <113324899+mqole@users.noreply.github.com>
* git commit -m shit i done

* oops
…can be hidden (impstation#4066)

* store listing condition hiding failed listings, discounts can only apply to buyable listings

* cleanup

* cleanup oops

* cleanup part whatever
* killerssssss

* Update uplink-catalog.ftl

* Update seeds.yml

---------

Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
Co-authored-by: mq <113324899+mqole@users.noreply.github.com>
* Hushpup Glow-Up

Cosmetic rework

* description update

* added the comment

ezpz
)"

This reverts commit a843fa8.

# Conflicts:
#	Resources/Maps/_Impstation/cluster.yml
#	Resources/Maps/_Impstation/union.yml
This reverts commit 80933b2.

# Conflicts:
#	Resources/Maps/_Impstation/oasis.yml
…tion#4042)"

This reverts commit 768e0dd.

# Conflicts:
#	Resources/Prototypes/_Impstation/Entities/Structures/Storage/Crates/crates.yml
This reverts commit 2987663.

# Conflicts:
#	Resources/Maps/_Impstation/eclipse.yml
#	Resources/Maps/_Impstation/gate.yml
#	Resources/Maps/_Impstation/submarine.yml
This reverts commit 7c8c359.

# Conflicts:
#	Resources/Prototypes/Entities/Objects/Fun/plushielizard_jobs.yml
This reverts commit 48cec71.

# Conflicts:
#	Resources/Prototypes/SoundCollections/lobby.yml
This reverts commit 150b34f.

# Conflicts:
#	Resources/Prototypes/_Impstation/Entities/Objects/Devices/Electronics/signaller.yml
#	Resources/Textures/_Impstation/Objects/Storage/boxes.rsi/meta.json
@Sage-Jones Sage-Jones merged commit 1c15300 into QuantumBlueSS14:master Mar 14, 2026
9 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.